Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 May 2011 21:16:24 +0000 (14:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 May 2011 21:16:24 +0000 (14:16 -0700)
commit9065a58df12dcfbe454cad1d1c2b33da779da177
treee4c03fcc86c4608310e49275ecf92e4538563c62
parentdae1f58b4b0e176dfe3e486c11cdbe49b0593338
parent9565520276c0ff0dd760334d54c36e87addc0606
Merge from mainline.